Handle item->translation_domain being NULL. (#166179, Diego Gonzalez)

2005-02-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
	being NULL.  (#166179, Diego Gonzalez)

diff --git a/ChangeLog b/ChangeLog
index 8c2ff2b33b9fccc860fc342143d689ff18738027..d276ce676682381d950e1d8d0d41cc48ecb83be6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
+       being NULL.  (#166179, Diego Gonzalez)
+
 2005-02-04  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Revert gtk_binary_version to 2.4.0. Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8c2ff2b33b9fccc860fc342143d689ff18738027..d276ce676682381d950e1d8d0d41cc48ecb83be6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
+       being NULL.  (#166179, Diego Gonzalez)
+
 2005-02-04  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Revert gtk_binary_version to 2.4.0. Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8c2ff2b33b9fccc860fc342143d689ff18738027..d276ce676682381d950e1d8d0d41cc48ecb83be6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkstock.c (gtk_stock_lookup): Handle item->translation_domain
+       being NULL.  (#166179, Diego Gonzalez)
+
 2005-02-04  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Revert gtk_binary_version to 2.4.0. Fix

diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 606df1b3002f0b6056496de06cc68e6ee58f6359..60fd3ecb42352bda630dce5a70a7305ba5c18d55 100644 (file)
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -166,9 +166,12 @@ gtk_stock_lookup (const gchar  *stock_id,
       if (item->label)
        {
          GtkStockTranslateFunc *translate;
-
-         translate = (GtkStockTranslateFunc *) 
-           g_hash_table_lookup (translate_hash, item->translation_domain);
+         
+         if (item->translation_domain)
+           translate = (GtkStockTranslateFunc *) 
+             g_hash_table_lookup (translate_hash, item->translation_domain);
+         else
+           translate = NULL;
          
          if (translate != NULL && translate->func != NULL)
            item->label = (* translate->func) (item->label, translate->data);